Skip to content

resolve conflicts merging 11.0.x#764

Open
Gary V. Vaughan (garyvvaughan) wants to merge 7 commits into11.1.xfrom
gvaughan/resolve-conflicts-merging-11.0.x
Open

resolve conflicts merging 11.0.x#764
Gary V. Vaughan (garyvvaughan) wants to merge 7 commits into11.1.xfrom
gvaughan/resolve-conflicts-merging-11.0.x

Conversation

@garyvvaughan
Copy link
Copy Markdown
Member

@garyvvaughan Gary V. Vaughan (garyvvaughan) commented Mar 14, 2024

Problem

$ git checkout 11.1.x
$ git merge 11.0.x
CONFLICT (modify/delete): Jenkinsfile deleted in 11.0.x and modified in HEAD.  Version HEAD of Jenkinsfile left in tree.
CONFLICT (modify/delete): sonar-project.properties deleted in HEAD and modified in 11.0.x.  Version 11.0.x of sonar-project.properties left in tree.
Automatic merge failed; fix conflicts and then commit the result.

Solution

$ git rm Jenkinsfile sonar-project.properties
$ git commit
[gvaughan/resolve-conflicts-merging-11.0.x 671aaa3] Merge branch '11.0.x' into gvaughan/resolve-conflicts-merging-11.0.x
Does this solution apply anywhere else?
  • yes
  • no
If yes, where?

Test Strategy

Testing done:
  • Unit tests
  • Integration tests
  • System tests
  • Manual tests

Release Plan

@garyvvaughan Gary V. Vaughan (garyvvaughan) requested a review from a team as a code owner March 14, 2024 16:56
@cla-assistant
Copy link
Copy Markdown

cla-assistant Bot commented Mar 14, 2024 •
edited
Loading

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 5 committers have signed the CLA.

✅ sp-gupta
✅ garyvvaughan
❌ cprovencher
❌ ConfluentSemaphore
❌ Ganesh Datta

Ganesh Datta seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

@garyvvaughan Gary V. Vaughan (garyvvaughan) changed the base branch from master to 11.1.x March 14, 2024 16:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@arihant-confluent Arihant Jain (arihant-confluent) arihant-confluent approved these changes

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@garyvvaughan @arihant-confluent @cprovencher @sp-gupta @ConfluentSemaphore